*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 23d790e2b74ca84b62cdc243ff60d6829f79c9d7..9816185dec7c0090f451c11e9c528a71d8fabc79 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,7 @@
 
        * facemenu.el (facemenu-add-face): Pass frame to facemenu-active-faces.
        (facemenu-set-face): Doc fix.
+       (facemenu-listed-faces): Doc fix.
 
 2006-08-09  Chong Yidong  <cyd@stupidchicken.com>
 

diff --git a/man/ChangeLog b/man/ChangeLog
index df2d8536e0b4a6d3042c836b9256fe280affa3dd..8d252755de6e0e5dada3f9b6cbfab968a35a09ee 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-10  Richard Stallman  <rms@gnu.org>
+
+       * text.texi (Format Faces): Substantial rewrites to deal
+       with face merging.  Empty regions don't count.  Clarify
+       face property inheritance.
+
 2006-08-08  Romain Francoise  <romain@orebokech.com>
 
        * dired.texi (Marks vs Flags): Fix typo reported by Ari Roponen